apigee: add addons_config to google_apigee_organization#16952
Open
xuchenma wants to merge 2 commits intoGoogleCloudPlatform:mainfrom
Open
apigee: add addons_config to google_apigee_organization#16952xuchenma wants to merge 2 commits intoGoogleCloudPlatform:mainfrom
xuchenma wants to merge 2 commits intoGoogleCloudPlatform:mainfrom
Conversation
Adds the addonsConfig nested object to the Organization resource YAML, exposing per-add-on toggles (advanced_api_ops_config, integration_config, monetization_config, api_security_config, connectors_platform_config) directly on the google_apigee_organization resource. This allows users to configure add-ons at org creation time, which was not previously possible. Previously a separate google_apigee_addons_config resource was needed after org creation. Fixes: hashicorp/terraform-provider-google#18486
modular-magician
added
the
awaiting-approval
|
Googlers: For automatic test runs see go/terraform-auto-test-runs. @shuyama1, a repository maintainer, has been assigned to review your changes. If you have not received review feedback within 2 business days, please leave a comment on this PR asking them to take a look. You can help make sure that review is quick by doing a self-review and by running impacted tests locally. |
Add a custom_check_destroy template for google_apigee_organization that
polls the API until the org returns 404 or enters DELETING state, instead
of immediately declaring it destroyed.
This fixes flaky test failures where CheckDestroy ran before the async
delete completed.
Background: b/242358013 blocks using LRO polling for org deletion (the
LRO endpoint returns 403 once the org is gone). As a workaround, the
custom_check_destroy polls GET /organizations/{name} directly.
Fixes: hashicorp/terraform-provider-google#8758
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Adds the
addons_confignested block to thegoogle_apigee_organizationresource, exposing per-add-on toggles directly on the org resource.This allows users to configure add-ons at organization creation time. Previously a separate
google_apigee_addons_configresource was needed after org creation.Add-ons supported
advanced_api_ops_configintegration_configmonetization_configapi_security_config(withexpires_atoutput)connectors_platform_config(withexpires_atoutput)Fixes
Fixes: hashicorp/terraform-provider-google#18486
Test Evidence
Existing acceptance test passes unchanged (import verify now ignores
addons_configsince the API may return default values not present in the config):